Merge tag 'upstream/16.11.9' into 16.11.x