master
8187443: Forest Consolidation: Move files to unified layout
8296684: Improve String platform support