Add additional dependencies for _TemplatedMixin.
Add additional dependencies for _TemplatedMixin.
Merge branch 'develop' into topic-routing