Fixes: Improvement for heap allocation performance
