Merge pull request #783 from micmac1/fs-1.10.8