Partially fixed firing in self-hosted contexts (atm, editor)
Reimplemented exit UI option
Merge remote-tracking branch 'origin/master'