Draft: Manila plumbing, squashed and rebased on master
Overview
This is to show the differences that !761 (closed) has with master, deconflicted. Don't merge.
This is to show the differences that !761 (closed) has with master, deconflicted. Don't merge.