timob-12529: address comments