Merge branch 'refactor/db-not-null-constraints-for-activity-expirations' into 'develop'