[GAIA BUG935636] - temporary solution in contact merger
Merge pull request #296 from michalbe/Bug935636-temp

[GAIA BUG935636] - temporary solution in contact merger