Ordinarily I would have carved this into one or two additional PRs but we are running short on time and I imagine you'll have questions about some of this.
I'm going to look at this more later and try to understand how the activity stuff actually works, but for now merging after a quick look-over so that what we have in prod is also what we have on master. :-)
Ordinarily I would have carved this into one or two additional PRs but we are running short on time and I imagine you'll have questions about some of this.