Merge pull request #490 from micmac1/17.01-AST-2019-006_007_008