Merge pull request #499 from micmac1/18.06-fs-up