Merge branch 'ivas-float-update' into 2034_ref_portFlp2235_ambiConv