Merge branch 'develop' into lbudginas/#435_account_page_overriding_search_filters_bug