SPChangeProcessor: Adding failsafe
Merge remote-tracking branch 'origin/develop' into index-reconciliation