Change resloveDrops argument to array of Elements
Merge branch 'master' into selectors