Merge commit 'upstream/0.16'