Imported Upstream version 7.38.5
Merge tag 'upstream/7.38.5'

Upstream version 7.38.5
new upstream version