Merge commit 'v0.5.0rc3'