Merge pull request #745 from micmac1/pj-AST-2021-009-2