template query parameters are now added to the data context before rendering
Merge branch 'develop'