Merge "Fix code-generation on x86 targets"