Merge branch 'for-2.6.23' into merge