Merge branch 'hotfix/2.1.1' into develop
Updated zshenv template
Update to 2.1.2
Merge branch 'release/2.1.2'