Merge remote-tracking branch 'dt-rh/for-next'