HOTFIX: APD-582 tree shadowing changed