Merge "Update clamp to 5.1.5" into guilin