am 83b97a6a: am 458f0633: For issue #2651381, allow library prelinking.

Merge commit '83b97a6a267a4ed9806191277289870156b2c372' into kraken

* commit '83b97a6a267a4ed9806191277289870156b2c372':
  For issue #2651381, allow library prelinking.