Properly updating counts in tree view for sub-object lists
Merge remote-tracking branch 'origin/develop' into develop