Update for 0.36.0.beta.1