Merge tesla-ganga into the main tesla branch