Update to 0.36.0