Merge "fix vfc chart issue"