Merge "Update vfc charts configutation"