timob-12810: address comments