Simplify
Merge branch '3.7' into 3.8
Merge branch '3.8'
Update branch information