Sync with upstream

Also removed toLowerCase() on the archive name.