Merged small_files branch