master
8230613: Better ASCII conversions
8191632: Typos in comments due to duplicating words
8187443: Forest Consolidation: Move files to unified layout