timob-12125: address comments