timob-12139: address comments