Merge commit 'f4bcd8ccddb02833340652e9f46f5127828eb79d' into x86/build