Fix template
Merge branch '3.7'