[TIMOB-12747] Address comments