Merge remote-tracking branch 'origin/ivas-float-update' into 1640_ref_port-mr-1347-from-float