Merge tag 'upstream/24.1'