Merge tag 'upstream/17.11.1' into 17.11.x