Merge "Add more clarity about integer encoding for keys"