Test case for #1920
Fix #1920
Add missing docs
Merge branch '3.8.x'