Merge pull request #457 from micmac1/AST-2019-004-18.06