Updating activity
Simplified activity
Merge branch 'dev/update.activity'
Release 3.38.0