master
8187443: Forest Consolidation: Move files to unified layout
8247546: Pattern matching does not skip correctly over supplementary characters