Handle cases where activity URL, activity name, and internal name vary.
Merge branch 'master' into algebra
Relucatantly update build artifacts (TODO: remove these and add to .gitignore)