Fix #2289
Merge branch '3.8.x'