Code refactor 2021/4/6

Merged Wang Yuyang requested to merge code_refactor_2021/4/6 into master

Merge request reports