Merge "Consistent handling of multiple keys in Message"