WP-2351 Adding branch for gsb_feature_base_fields