Merge branch 'bugfix/tesla-safety' into 'develop'