timob-16358: addressed comments