[TIMOB-13052] Address Comments