Merge "Make NPVC match on qpr and main"