Merge "Standardized Config for VFC"