solve 2417_Flick_input
Merge branch 'feature-2417_Flick_Input'