Fix more activity problems (#4236)
Merge branch 'release' into upstream