Ticket0474: Multiple dropAfter targets are created unintentionally
Clean up
Merge branch 'Ticket0474'