Modified key mapping.
Merge branch 'master' into kernel_setting