BUG-12604-12174-13122_v2 IMPROVEMENT