Merge pull request #596 from micmac1/ast-AST03-04