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