Merge branch 'file_pruned_revamp'