Merge "Fix crash in KeySet dump" into lmp-dev