@Thomas, i got two rejects when trying to apply the patch. Let me sync to your base version first, to avoid additional diffs, where/when did you branch exactly?