Merge "changes to be added in few steps" into guilin