[TIMOB-13417] Address comments