Merge branch 'jn/revert-quit'