BUG-13626 IMPROVEMENT
Merge pull request #2224 from gproly/BUG-13626

BUG-13626 IMPROVEMENT