Merge branch 'nd/merge-quit'