Merge remote branch 'kumar/merge' into next