Merge commit 'upstream/1.6.9p17'