[TIMOB-14990] Manual backport to 1_0_X
Merge pull request #241 from bryan-m-hughes/timob-14990-1_0_X

[TIMOB-14990] Manual backport to 1_0_X