Merge "Reduce memory usage by some extractors." into oc-dev