Merge branch 'upstream-17.11-stable' into 17.11.x