Re #7673. Fixing performance tests.
Merge branch 'feature/7673_lack_of_groups' into develop