Merge branch 'nd/cherry-pick-quit-fix'