Imported Upstream version 24.0
Merge tag 'upstream/24.0'

Upstream version 24.0