Merge pull request #793 from micmac1/ast-18.5.1-21.02