Merge branch 'VAT-638' of github.com:Parag18/civicrm-core into Parag18-VAT-638