Doesn't link yet though, need to check why.
(cherry picked from commit ff31d489c68d5d9e597bd55a6f6a64f3fe4c7ecc)