[TIMOB-13491] Manual backport to 1_0_X
[TIMOB-13491] Bug fix
[TIMOB-13491] Bug fix
Merge pull request #156 from bryan-m-hughes/timob-13491-1_0_X

[TIMOB-13491] Manual backport to 1_0_X