Work on bug #7936.
Work on bug #7723.