CHANGED setting the template for view to a later moment.
Merge branch 'develop'