Sync with production
refs #2291 - Added field type to WG