Make relavent change with forest refactoring.
Merge remote-tracking branch 'origin/master' into riversyang