Hotfix: Don't index stopped date for now.
Merge branch 'production' into test