Merge pull request #203595 from ncfavier/registry-paths
authored by Naïm Favier and committed by GitHub 3 years ago e989ef96 3f09bb9d