Fix 3.8 version
Merge branch '3.8'
Fix 3.9 version