timob-12939: address comment