[TIMOB-13416] Address Comments