...OK, there is room for debating. But I don't want to delay the merge of this for that.
Let's merge this first, and I'll file it in bugzilla.