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