Merge "Change heap base address"