Fix cloneInto and add lightenPayload

Change-Id: Ibf790d90b3ddd430f20e1ed402e2d5615ec3fcdd