Merge branch 'upstream' into 17.11.x