timob-13796: address comments