Merge remote-tracking branch 'origin/ivas-float-update' into 1636_ref-port-mr-1502-from-float