timob-14075: address comments