Port patch from branch_1_1 to the HEAD