TIMOB-14178-Addressed review comments