Merge "Fix #2489986 : The key bitmask needs to cover all possible keys"