Merge remote-tracking branch 'asoc/fix/wm2000' into tmp