timob-16634: addressed comments