Imported Upstream version 2.99.2
Merge tag 'upstream/2.99.2'

Upstream version 2.99.2