Merge commit 'v0.10.3' into stable-0.10