Wip 7810

This is triggering MDS crash #9173