timob-14075: addressed comments.