Merge branch '3.8-dev'