externals: using v21
Merge pull request #9126 from ricardoquesada/v21_externals

externals: using v21