Merge branch 'develop' into lbudginas/#364_update_search_responses