Merge tag 'upstream/24.0'