Merge remote-tracking branch 'origin/ivas-float-update' into 2144-ref-PortMr2135-from-float-omasa-jbm-object-editing
