Pass the model for more flexibility but still set the query
Merge pull request #3074 from obrignoni/2.3/develop

2.3/dev Pass the model for more flexibility but still set the query