Merge remote-tracking branch 'kumar/merge' into merge