[TIMOB-13491] Worked around messaging bug
[TIMOB-13491] Bug fix
[TIMOB-13491] Bug fix
Merge pull request #155 from bryan-m-hughes/timob-13491

[TIMOB-13491] Worked around messaging bug