BUG-13626 IMPROVEMENT