Fixes: Improvement for heap allocation performance
Category: stable
