[TIMOB-15521] Address Comments