Some changes for bug #8392.