Wip 7810

This is triggering MDS crash #9173
I suspect it will be easier to enhance now than later, but whatever floats your boat...