Merge commit 'kumar/kumar-next' into next