Merge branch 'filter-tesla-config' into 'develop'