Merge pull request #761 from micmac1/21.02-AST-2022-01-02-03