Merge "Add guilin branch"