Merge pull request #2761 from yellowred/self_sufficient_psbt