Merge branch '4.0-dev' into 4.0 (0.2.2)