[TIMOB-11771] Address comments