master
8297856: Improve handling of Bidi characters
8187443: Forest Consolidation: Move files to unified layout