APD-633:Object page: Missing scrollbar in tree
Merge branch 'APD-633' into develop