Fixes #4468: Add check box to enforce or not group content