[0.6.x] Backport #607 and #434 #608
+27
−25
Merged
Loading