Merge branch 'update-activity-fixes' into 'develop'