[OE-2716] contacts refactoring now reasonably stable, needs more testing.