merge from master to R2.0 

refactor/recalculating Disks-host tree objects