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