Merge "Improve time to texture destruction" into oc-dev