Comment 53 for bug 1773417

This is a bit of an oddity for backporting, as it mixes a bunch of bug fixes together with re-implementations of features to resolve serious workflow deficiencies. I've decided to backport for 3.1, but leaving 3.0 as an open question for the release maintainer, for now.