Update zshenv
Updated submodules
Merge branch 'release/2.1.1' into develop