Merge branch '3.7'