Merge branch '1.0' into develop