backport: merge bitcoin#18952,18817#5013

PastaPastaPasta merged 2 commits intodashpay:developdashpay/dash:developfrom

vijaydasmp:bp21_3vijaydasmp/dash:bp21_3Copy head branch name to clipboard