done with refactoring despite tree issues
Authored by: alessio-gaspar 2014-09-24
Parent: [r118]
Child: [r120]
