Merge branch 'upstream-2.17.0'