Merge remote-tracking branch 'origin/main' into 1971_basop_port_mr_2219_ext_orient_sanity_check