- fixes template locking
Merge branch 'hotfix/template-locking'