Merge branch 'ivas-float-update' into 1680_ref_port_object_editing_implementation