GPII-177: Updated remaining NP set to have the proper value for tracking as required by ISO-24751 and model transformation