Revert "Merge branch 'master' into 'master'"

Merged Zhang, Tong requested to merge revert-1e3a1d7c into master

This reverts merge request !8 (merged)

Merge request reports