Merge remote-tracking branch 'remotes/origin/ivas-float-update' into object_editing_API