Add duplicate subtask handling and tests

Change-Id: I08244cfb488ef576477ecd151a73ed4cb820eca4
7 files changed