Merge commit 'upstream/0.5.0'