Test case for #1335
Merge branch '3.8.x'