Merge remote-tracking branch 'origin/main'

# Conflicts:
#	docs/releasenotes.html