Merge "NPMS lock improvement."