Merge branch 'ivas-float-update' into port-jbm-fix