Fix assign_template
Merge branch 'develop'