BUG-12830 SOLVED
Merge pull request #2037 from gproly/BUG-12830

BUG-12830 SOLVED