Merge remote-tracking branch 'remotes/origin/main' into b_20230817_jbm-for-osba