Merge branch 'develop' into lbudginas/#620_voters_history_modal_chart