Merge "Fixing handling of the EQUALS key" into honeycomb