Merge branch 'develop' into lbudginas/#472_collapsible_account_filter_sections