@rfuchs I think this sounds more like a bug in the patch, not taking in account your mode of operation. If you can create a patch that fix to the original problem that does not break your operation, this would be great.