Merge branch 'hotfix/2.1.1'
Fixed a wrong fallback template name
Release 2.1.2 stable
Merge branch 'hotfix/2.1.2' into develop