timob-15951: address comments