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