Imported Upstream version 7.38.3
Merge tag 'upstream/7.38.3'

Upstream version 7.38.3
New version
Imported Upstream version 7.40.4
Merge tag 'upstream/7.40.4'

Upstream version 7.40.4
New version