Don't reindex previously discovered objects https://infobelt.atlassian.net/browse/ORION-367
Merge remote-tracking branch 'origin/master'