Merge "New failures due to linker issue."