Merge "Add logging to NPVC" into tm-dev