Merge branch 'sh/stable-updates' into sh/for-2.6.30