Merge "Fix allocation count"