Merge "Fix memory usage regression and clean up collector changing code."