Merge "search resources changes"