Merge branch 'feature/409-cron-expire-flag'
Update settings.
Merge branch 'master' into feature/409-cron-expire-flag
Add todos.