Merge "Fix finalization"