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