Merge "Update for 1.0.0-beta1" into pi-dev