Merge remote-tracking branch 'asoc/topic/s6000' into asoc-next