master
8187443: Forest Consolidation: Move files to unified layout
8339180: Enhanced Building of Processes: Follow-on Issue