Minor bugfixes and test improvements to #4109 #4182
+167
−179
Merged
Loading