Merge pull request #776 from micmac1/ast-18.4