Merge "Workaround x86 interpretter stack overflow"