Merge "Fix KeyValuePairsAtom"