timob-16485: address comments