Merge from upstream, some activities currently "broken." Probably from config issues