Merge tag 'upstream/18.02' into 18.02.x