Merge commit 'upstream/0.2.85+hg33' into experimental