Merge "Fix key handling"