10a1a5c565
which could sadly not get cherry-picked! (Possibly being based to a differing parent commit)