Merge remote-tracking branch 'origin/ivas-float-update' into 1680_ref_port-object-editing-API