Heap 0.8.0
Merge pull request #10283 from matinm/master2

Heap 0.8.0