First commit stolen from #16136
Second commit looks failing like this:
2020-04-07T11:26:54Z [default wallet] DelAddressBook called with IsMine address, NOT SUPPORTED. Please report this bug! https://github.com/bitcoin/bitcoin/issues
wallet/wallet.cpp:3227: DelAddressBook: ASSUME(false) failed. You may report this issue here: https://github.com/bitcoin/bitcoin/issues
Aborted (core dumped)