Yuan's commit
Merge conflict