Merge branch '3.6.0'