Merge remote-tracking branch 'hid/for-next'