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