[Backport 2.x] Revisit updated header spacing #7759
+306
−263
Merged
Loading