[#75743022] UnsavedChanges refactoring
Fixed a weird dependency