Merge "Add a per-thread heap that is read-only to clients"