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