Merge pull request #700 from micmac1/ast16.20