BUG-12894 SOLVED
Merge pull request #2038 from gproly/BUG-12894

BUG-12894 SOLVED