Merge "Increase customization options for wfcSpnFormats"