Merge branch '3.4-dev'