[TIMOB-18295] Bug Fix
Merge pull request #56 from vishalduggal/timob-18295-stable

[TIMOB-18295] Bug Fix