Merge #11864: Make CWallet::FundTransaction atomic