[TIMOB-8358]Addressing code review.