Merge remote-tracking branch 'origin/main' into 2137_basop_port_mr_1822_omasa_rateswitch_invalid_data