BUG-12932 SOLVED
Merge pull request #2051 from gproly/BUG-12932

BUG-12932 SOLVED