Merge branch 'develop' into lbudginas/#485_collapsible_filters_on_balance_history_page