Merge branch 'refactor/ingestion-activity-context' into 'develop'