Imported Upstream version 7.42.0