Merge pull request #4789 from sejongoh/always_download_coredistools