Merge branch 'v3.0.x' into patch-3