1093874 2nd attempt

New pull request created for Bug 1093874, reverting dummy filechange commit
`handle_various_files` ? can you make this one more specific?