Merge commit 'upstream/2.13'