Merge remote-tracking branch 'input/next'