CDB-2566 few fixes and more privacy changes to support LINK type