add Test for conditional tree builder
resolve problems with sort by support in conditional tree builder class
Merge remote-tracking branch 'origin/master'