Merge branch 'release/0.9.8' into develop