Merge "Correctly generating heap dumps for OOP tests"