Merge "Fix the deploy cl payload issue"