Pass back activities if principal is not a user
Merge branch '0.2.x'