Update from hg repository. Macros for different heaps