Work on bug #8356.  Framework is in place.