Bug 13626 IMPROVEMENT