WP-3013 More field/form changes