Merge tag 'upstream/3.0.717'