[TIMOB-14420] Address Comments