Imported Upstream version 1.7.38
Merge tag 'upstream/1.7.38'

Upstream version 1.7.38
Imported Upstream version 1.7.39
Merge tag 'upstream/1.7.39'

Upstream version 1.7.39