Merge pull request #792 from micmac1/ast-18.5.1-22.03