Merge branch 'release/v0.9' into development