Merge tag 'upstream/18.11-rc3' into 18.11.x