Merge "Release 7.0.0" into guilin