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