Merge "add guilin branch for jjb"