Github-Pull: #8662 Rebased-From: 46606af200db563ca742b56f291cee2311a27491
Same key, extended expiration date