Merge pull request #762 from micmac1/19.07-AST-2022-01-02-03