Merge branch 'Transmission' into tomato-shibby