Imported Upstream version 7.38.1
Merge tag 'upstream/7.38.1'

Upstream version 7.38.1
New version