BUG-12880
Merge pull request #2048 from gproly/BUG-12880

BUG-12880 SOLVED