Merge pull request #620 from micmac1/ast-2021-1