SD-56514842-add the activity_id to the export
Merge branch 'master' into staging