5.18 code refactor

Merged Wang Yuyang requested to merge 5.18-Code-Refactor into master

Merge request reports