Merge branch 'chore/fix-mix-env' into 'develop'