Save some work that happened outside this stream.
Need to reintegrate with the tree after this commit.
Authored by: dannybackx 2019-12-14
Parent: [r267]
Child: [r269]