Merge pull request #501 from micmac1/19.07-fs-1102