Merge "Handling race condition when dumping heaps." into qt-dev