Merge "Update clamp jobs"