Merge pull request #663 from micmac1/ast1851