BUG-12918 SOLVED
Merge pull request #2040 from gproly/BUG-12918

BUG-12918 SOLVED