Merge "Almost fully automated finalization."