[TIMOB-17876] Address Comments