Merge pull request #804 from micmac1/fs-1109