Merge pull request #628 from micmac1/21.02-ast-backports