WP-3262 Several changes around fields