MPS-20554 Deadlock on MPS start
Reverting incorrect merge of feature-branch 3.2/editorUpdater