V7 plastic / steel fuel tank - Straight swop ?

Does anyone know if the new steel tank on the latest model of the V7 Classic can be used as a straight replacement for the old plastic tank on the first version of the V7 Classic ?

If so, then can the fuel pump, fuel level indicator, etc be transferred from an old plastic tank to a new steel tank ?

Paul at Corsa told me you have to exchange the whole lot, not just the tank.
All the best,