CR fix to change back to setPayload with const param