GPII-304: Identical to original pull request - except minor fix to transformations and renaming of one of the NP sets