Merge commit 'upstream/0.2.9'