Collapse Release 0.8.7 branch to master