[TIMOB-3370] Address comments