v0.8.8

This is a patch release which is cherry-picked. In the previous release there were changes which weren't ready for a patch release and were removed in this one.

This release should not be affected by #647

Full Changelog: v0.8.6...v0.8.8