Merge remote-tracking branch 'origin/main' into fix/811-watch-observer-robustness

# Conflicts:
#	CHANGELOG.md