Imported Upstream version 7.38.5