Merge remote-tracking branch 'origin/ivas-float-update' into 2149_ref_port_mr_2268_fix_object_editing_issues_remainders
