Merge "Fix Clamp merge job"