[TIMOB-6828] Address comments