This is a backport of Core [[https://github.com/bitcoin/bitcoin/pull/13219 | PR13219]] and [[https://github.com/bitcoin/bitcoin/pull/13806 | PR13806]] . Due to many backport being done out of oder or improperly, this contains elements of [[https://github.com/bitcoin/bitcoin/pull/15413 | PR15413]] and [[https://github.com/bitcoin/bitcoin/pull/15788 | PR15788]]