Merge "Preparation for CSIT on both master and guilin"