Merge branch 'touch_hack'