[security] Improved tree display
Merge remote-tracking branch 'remotes/origin/sentry' into sentry