Merge from branch_3_2