timob-16180: addressed comments