Merge branch 'hotfix-2.0.4' into develop
Fixed Error w/ Redirect if Only 1 Tree but Permission to create
Merge branch 'hotfix-2.0.5'