Merge "Fix bug in maximum number of allocs."