Merge "bug 537 - Node Reconciliation"