Test case for #1862
Fix #1862
Fix typo in test file name
Apply #2241 to 3.8.x
Merge remote-tracking branch 'upstream/3.8.x' into 3.8.x