The original commit removed parameter `-addresstype=legacy` in the rpc call. We never had this parameter, AFAIK.
The backport of the rest of the changes makes subsequent backports easier.
This concludes backport of Core PR16078
Commit: https://github.com/bitcoin/bitcoin/pull/16078/commits/0784af16efce1434eff90aef8bf9823e5c7751e8
Depends on D8050