Merge remote-tracking branch 'h8300/h8300-next'