Merge "Temporary remove resource-display caching" into oc-dev