BUG-13623 IMPROVEMENT