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