Let options.fields be a set.
Merge branch 'feature/concrete-supermodels' into develop