Resolve #3588687 "Canvas cleanup"

Closes #3588687

Merge request reports

Loading