Merged with mkoistinen/touchsupport
Merged with downstream