merge from upstream
Prepare 0.26.0 release
Prepare 0.26.1 release