Imported Upstream version 7.40.6