Added multidrop task lock and tests