Merge activity tracking edits into alpha