Merge "Quick compiler: x86_64 workaround"