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