Updated Bundle ID usage to account for recent updates
Fixed some issues with deduplicated object -> duplicate object mapping
Fixed some issues with deduplicated object -> duplicate object mapping
Merge remote-tracking branch 'upstream/master'