Merge remote-tracking branch 'origin/main' into 1497_basop_port_MR1365_OMASA_EXT