master
8187443: Forest Consolidation: Move files to unified layout
8253497: Core Libs Terminology Refresh
8232419: Improve Registry registration