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