timob-15244: address comments