This should hopefully fix the issues we have been seeing on CI. While I’m not super keen on including non-upstreamable patches it seems better than having CI be flaky. changelog_begin changelog_end
