Implement Forest-Only Mask as Default issue #56