Merge branch 'activity-expiration' into 'develop'