Merge commit 'upstream/0.14.01'