1095332 - updated the position of checking for existing units and associating them with repo, so that the progress calculations are not affected