Merge "Implement support for ALT and SHIFT modifiers"