Merge remote-tracking branch 'alfh/bugfix_menu_touch' into next