Merge commit 'v2.6.29' into core/header-fixes