[BUG #7063, #7139] take over improved treegenerator_3 to branch_2_1_x