Test key events fix2



<!---
@huboard:{"order":5.960464477539063e-08,"milestone_order":1045,"custom_state":""}
-->