Merge "Support promotion of WFC." into nyc-mr1-dev