Code refactor 2020 4 5

Merged Wang Yuyang requested to merge Code-Refactor-2020-4-5 into master

Merge request reports