Comment 4 for bug 1822329

Multiple development cycles. Need to catch up with current master, and probably rebase these changes into an updated (in sync with master) "rewrite" branch.