Merge branch 'main' into 1114-bip-340-schnorr-signatures

# Conflicts:
#	docs/releasenotes.html