Merge pull request #669 from micmac1/19sof14