TIMOB-16266-Addressed review comments