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