Backported changes from prod. Removed field_features