Merge "Bump up clamp to 5.0.4"