Hi Thomas,
could you maybe cherrypick the same patches from the 6.0 branch? The relevant commit IDs are e933c6dd9d62bf8ed09f5eb47d3f1cc59405a492 048586179fe635ee01af371411b81c49238e3581 This should come down to the exact same changes, just with a lower chance for error & is a bit more useful when looking up details about the patches (e.g. you can get to the upstream CI PASS for 6.0 from these IDs, which is way more relevant than the fact that it passed on 7.2.) Cheers, -David
