Merge branch 'feature/handle-quit-event'