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