LPS-34931 Need groupId in dynamic_data_lists.csv
LPS-34931 More logical order