Merge branch 'quitHandling' into develop