Merge remote-tracking branch 'origin/main' into review/pr-52

# Conflicts:
#	CHANGELOG.md