Merge commit 'kumar/kumar-next'