Merge branch 'release/v0.3.5'
Merge commit 'release/v0.3.5' into development