timob-16212: addressed comments