Merge from branch "conanshang".