Merge branch 'chore/back-to-upstream-tesla' into 'develop'