Merge branch 'develop' into lbudginas/#562_update_block_search_results_ui_on_main_page