Merge branch '3.0'