Merge pull request #432 from micmac1/fs-186-1806