Merge remote-tracking branch 'origin/main'

# Conflicts:
#	dist/plugin.json
#	package.json
#	yarn.lock