changed in branch_1.06