Please give us the possibility to let US decice if files should be grouped or not

Early 2021 clean-up: duplicate