Apply some v2.48 regression bugfixes #5376
+519
−236
Merged
Loading