Merge commit 'upstream/0.9.6'