*8831* Make ALM working only with local stats, set deposit optional
Merge pull request #262 from beghelli/8831-fix

*8831* ALM tweaks