Merge commit 'kumar/kumar-merge' into merge