Merge remote-tracking branch 'remotes/origin/ci/osba-ivas-modes' into b_20230817_jbm-for-osba