Pick up elements from fix-downloader branch