Merge tag 'upstream/16.11.8' into 16.11.x