[ #26649 ] Fix linking issues