Release 0.8.10 merge into master