Basic payment integration
Find all wallets
Payment tweaks
Merge branch 'master' into payment