Bug 8902 - Reconciliation Framework changes