Merge "Fix Java Heap Dump configs" into main