LPS-46261 don't separate the ADTs by group