Merge branch 'sh/g3-prep' into sh/for-2.6.33