GPII-383: Updated NP sets according to michelles comments based on diffs in between branches