Merge pull request #739 from apertoso/7.0-bug-vat_intra