Merge branch 'du/cherry-is-plumbing'