Merge branch '878-activity-object-decoupling-in-tests' into 'develop'