[TIMOB-13478] Address comments