Merge commit 'v2.6.26' into x86/core