Merge branch '1.0' into 1.0-generated-control