[Backport 2.x] 12073 and 12267 #12279
+728
−179
Merged
Loading