[TIMOB-14586] Address comments