templates and change pool to local
Merge branch 'develop'