Merge "Split NPVC#mQsExpansionEnabled" into sc-dev