Track unique IDs to ensure that they are truly unique

mrweinerrequested to merge
issue/sfc-3309555:3309555-sfcuniqueid-may-be into 8.x-1.x

Closes #3309555

Merge request reports