Update v36

Update to v0.9.2.36