WP-4621 Added base fields so need new branch in build.