Merge branch 'develop' into fix/activity-expirations-again