Ingrated last template modifications
Merge branch 'develop'