Changes for bug #98440