WP-2354 Added base_fields to the make changes