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