timob-13686-v3: addressed comments