Merge branch '2156_ref_port_mr2076_omasa_ext_incorrect_output_object_editing'...

Merge branch '2156_ref_port_mr2076_omasa_ext_incorrect_output_object_editing' into 'ivas-float-update'

[non-BE] Port 326 and 340 - Float MR 2076 and 2135 to ivas-float-update - OMASA EXT and JBM object editing fixes

See merge request !2453