Merge pull request #487 from micmac1/AST-2019-006_007