merge from ivas-float-update