Merge "Adding MSDL feedback to NPVC" into main