Reconciliation. Nothing big.

Generic reconciliation for master.