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