Merge Release 0.8.7 to master