Merge latest Main into Wallet branch. Wallet gets cash in HUD + this sorts out some merge conflicts before they get any worse.