Merge "Fix bug number for linker related workarounds"