timob-16436: addressed comments