Correctly pass back activities from minor stream function
Merge branch '0.2.x'