Merge branch 'ivas-float-update' into 1890_ref_mr2052