Work on bug #7393.