WP-2448 Another try at getting these new fields setup with features