Avoid downloads when wanting to keep existing files
Merge branch 'refactor_bootstrap'