Draft: Issue #3560933: Rejig order to work around trash module

Closes #3560933

Merge request reports

Loading