Merge commit 'v0.6.2' into stable