Merge "Remove nsPrefix references from vfc chart"