Merge pull request #732 from micmac1/sof-1137