Update with 0.35.2 features and 0.36.x plan.