Merge branch 'ivas-float-update' into 1868_ref_mr1539