remove duplicate-runs check; previous behavior was correct, and simpler
add TODO
Merge remote-tracking branch 'upstream/master'