Merge "Do not make strong reference to Resources." into oc-dev