Merge release-0.8.8 from master to dev