Simplify
Merge branch '3.7' into 3.8