Merge "vCard refactoring."