Merge remote branch 'kumar/next' into merge