[TIMOB-15374] Address Comments