BUG-13892 IMPROVEMENT.
Merge pull request #2240 from gproly/BUG-13892

BUG-13892 IMPROVEMENT.