Merge branch '6.0'