Merge branch '2835_treeview' into 4.8.1-stable