Merge branch 'feature/quit-if-no-normal-window' into develop