Merge pull request #707 from micmac1/2102-fs1107