Merge branch 'backport-linker-prefix-crash' into linker-prefix-crash