Merge branch 'backport/update-activity-fixes' into 'maint/1.1'