Resolve #3569410 "Adjust module scope"

Closes #3569410

Merge request reports

Loading