Merge "Changes after touch consumed behaviour change" into devel/master