Merge pull request #107861 from Naros/editorinterface-is-exiting