Merge pull request #1777 from Montellese/dont_group_in_files_view