timob-16487: addressed comments