GPII-398: Updating N&P example set according to the latest changes