Merge branch 'ivas-float-update' into 2078_ref_portFlpMR1564_aeIdFileTests