Merge commit 'dfe07a850b1125f660cf8c73fdbf0a18df4f58e4' * commit 'dfe07a850b1125f660cf8c73fdbf0a18df4f58e4': Make ContactStruct handle Collection properly.
Merge commit 'dfe07a850b1125f660cf8c73fdbf0a18df4f58e4' * commit 'dfe07a850b1125f660cf8c73fdbf0a18df4f58e4': Make ContactStruct handle Collection properly.