[TIMOB-16275] Addressed comments on PR