Merge tag 'upstream/17.11.2' into 17.11.x