Merge some more changes from team/russell/events