Merge branch 'wip/mt-touchpad'