Resolve #3618441 "Manual clean up after"

Closes #3618441

Merge request reports

Loading