Merge remote-tracking branch 'remotes/origin/main' into 20231020_maintenance