Merge branch 'minimize-files'
^^