Merge branch 'fix/tesla-client-opts' into 'develop'