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