Imported Upstream version 7.38.3
Imported Upstream version 7.40.4