Merge "Fix lookupkey encoding/decoding"