Merge branch '3.0.x' into release/3.0.0-beta-1