Ensure trash context is reset

Closes #3612533

Merge request reports

Loading