Merge branch 'main' into websdk

# Conflicts:
#	.eslintignore
#	solutions/blocks/footer/footer.js
#	solutions/blocks/header/header.js
#	solutions/scripts/delayed.js
#	solutions/scripts/scripts.js