Update WalletCount to 2.0 (3)

2 jobs for master in 5 minutes and 40 seconds