Merge remote-tracking branch 'origin/main' into 1973_basop_port_mr1748_omasa_ext_jbm_brsw_usan