Start of work for bug #8034.