Merge remote-tracking branch 'origin/main' into ci/test_more_ism_ext_out_in_selftest