[TIMOB-17083]: address comments