Merge branch 'master' into file_pruned_revamp