Merge pull request #570 from micmac1/1907fs10105