Merge pull request #435 from micmac1/17-ast13-AST-2019-003