1.9.0.M1 release
Merge branch '1.8.x' into develop