Merge "Add null check on NPVC" into sc-dev