Merged den's forestry support into MFR properly