Merge branch 'develop' into lbudginas/#647_balance_history_optimization