Merge pull request #770 from micmac1/21.02-sof-1.13.8