Resolve #3575461 "Bulk cleanup before alpha pt1"

Closes #3575461

Merge request reports

Loading