Merge RPC and wallet updates from 0.4.4.7