don't alias field names if an alias was not provided
handle fields prefixed with the model's table name
Merge branch 'develop'