Merge remote-tracking branch 'asoc/fix/sh' into asoc-next