port fix from branch_1_1