update as per latest ivas-float-update branch