- ticket inline
- backport 0.9-related updates
0.8.7