Merge pull request #844 from micmac1/fs-1.10.11