[369789] Ensure that setting the type is undoable
6 files changed