Merge branch 'ivas-float-update' into 2106_ref_several_small_code_improvements