Merge "Workaround for cert expiration" into elalto