AddFaceBasedFamilyToLinks and before removing compilation warnings