TIMOB-8797-Addressed review comments