Test for #2252
Fix #2252
Merge branch '3.8.x'