Fix merge
Merge branch '3.8'