Merge branch 'release-0.8.7'