Automatic resizing for the tree expander
Merge branch 'APD-592' into develop