Added in the basic structure for bug #8296.