Merge commit 'kumar/kumar-for-2.6.28'