Merge "Upgrade to guilin branch"