BUG-12604-12174-13122_v2 IMPROVEMENT
Merge pull request #2185 from gproly/BUG-12604-12174-13122_v2

BUG-12604-12174-13122_v2 IMPROVEMENT