timob-14215: addressed comments