Update heap, lockfree from master.