Merge Release 0.8.8 into master