[TIMOB-9593] Address comments