Started work on bug #7910.