Merge commit 'v2.6.30-rc1' into core/urgent