CA-135774

Here are all the commits to fix the memory usage situation in CA-135774.