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