Resolve #3553836 "Refactor the module"

Closes #3553836

Merge request reports

Loading