Merge commit '22a17ce60b5e8770ad950cc3da6d8f5a2be3b879' * commit '22a17ce60b5e8770ad950cc3da6d8f5a2be3b879': VCard refactoring backport.
This commit is contained in:
Merge commit '22a17ce60b5e8770ad950cc3da6d8f5a2be3b879' * commit '22a17ce60b5e8770ad950cc3da6d8f5a2be3b879': VCard refactoring backport.