Can't trigger same api call

Thread never closes
Sorted backup files
Don't reindex on startup
Merge branch 'refs/heads/develop'
Migration fixes
Merge branch 'refs/heads/develop'
Merge remote-tracking branch 'upstream/master' into develop