Merge commit 'upstream/0.1.18'