Resolve #3585740 "Refactor undo"

Closes #3585740

Merge request reports

Loading