[TIMOB-16855] Address comments