Don't select fields
Merge branch 'master' into kingman