keyboard mode and input
Merge branch 'develop'