Bump Heap to 0.6.0
Merge pull request #9984 from matinm/master2

Bump Heap to 0.6.0