BUG-12494 SOLVED
Merge pull request #2042 from gproly/BUG-12494

BUG-12494 SOLVED