Merge branch '1497_basop_port_MR1365_OMASA_EXT' into 'main'

[NON-IO]Port MR 1365 OMASA EXT from IVAS PC to BASOP

See merge request !1937