[TIMOB-15777] Bug Fix
Merge pull request #5005 from vishalduggal/timob-15777

[TIMOB-15777] Bug Fix