TIMOB-15621-Addressed review comments