Merge branch 'hotfix/tesla-env-no-access' into 'develop'