For ENG-6702, inch closer to having working unique ids for DR2