GPII-383: Final changes before review - added last NP sets
GPII-383: more users for review
Merge remote-tracking branch 'upstream/review2' into review2
GPII-383: merged latest changes from master
Merge pull request #209 from kaspermarkus/review2

Review2 - fixed NP sets