Merge branch 'resource_search_priority' into development