CR for Job #20107 - Keys p and h and some control keys wont override

Code Review for Job #20107 - Workitem available at https://www.worklist.net/20107