master
8337302: Undefined type variable results in null
8187443: Forest Consolidation: Move files to unified layout