Merge remote-tracking branch 'origin/main' into 2156_basop_port_mr2076_omasa_ext_incorrect_output_object_editing