Imported Upstream version 7u45