Merge pull request #341 from micmac1/AST-1701