master
8200128: Fix some "annoations" typos
8187443: Forest Consolidation: Move files to unified layout