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