[TIMOB-15777] Bug Fix
Merge pull request #5006 from vishalduggal/timob-15777-31X

[TIMOB-15777] (3_1_X) Bug Fix