Issue #3517715: Update code for remove all button

Closes #3517715

Merge request reports

Loading