Hi Christoph, Please do not fold the upstream PR into one patch file. That makes tracking it very hard. Thanks, Bastian