Fix for activity dedupe
Merge branch 'dev' into test