master
8201433: Fix potential crash in BufImg_SetupICM
8187443: Forest Consolidation: Move files to unified layout