Vat import hotfix -> Master

Not so much a hotfix anymore, but we would still like to apply this code as it makes sure the VAT import and Check CVE stages parse code the same way.