timob-11762: addressed comments