Heap 0.7.0
Merge pull request #10237 from matinm/master2

Heap 0.7.0