Please only merge if tests succeed. Otherwise feel free to close issue as I won't be working on it soon otherwise.
@tsteur the build passes and this PR does look OK. It does not fix #9840 though, as I still get the same error
it's been merged but @tsteur maybe have a look at it looks like you thought it would fix the bug