Using #22493 + #22500 gives the failure mentioned in the subject line [crash-6ddb0b69a79d653752c09a9000e9006f43de75fc.log](https://github.com/bitcoin/bitcoin/files/6846129/crash-6ddb0b69a79d653752c09a9000e9006f43de75fc.log)