Re #10769. This should fix the ld_preload issue.
Merge remote-tracking branch 'origin/bugfix/10769_ld_preload'