FLEX-34054 turned grouping off